Restructured unit tests
Moved test files into folder 'units'
Fixed some formatting issues