Building out tests properly