Please implement the test referencing #254. It's fine to separate the PRs. Just do it bit by bit as much as you can.
