moving tests to more appropriate place. and adding one.