Code formatting
Organized unit tests