Moved test files, bug fixes