writing more tests & moving tests around