Updated unit tests
sorted log output