Cleaned up files that belong to a feature branch
Corrected mistake in test files