Organized test files, added class templates