Moved some test files
Fixed several bugs