cleaned up testfiles and moved some to their respective places