I developed them at once and then tried to break them into separate PRs, I guess I partial committed wrong. The test belongs here though ..