renamed two files
moved some tests