splitted unit tests

Please comment