Renamed test folder to tests and did some minor refactoring on the unit testing bootstrapping