Building out more tests