moved tests to appropreate files