Removed extra space.
Organized tests in an alternative structure.