splitted unit tests into categories
reverted unit test categories
minor
minor