fix unit tests, coding standards