Some classes used in unit tests were in main -tree.