Test moved to be better-readable

- joining tests that belong to each other