Introduce more tests