Moved around test files and prepared for 0.3