added tests, moved tests