moved tests to they test the appropriate class