Split unit tests

Split unit tests based on latest classes split