Introduce some more tests