fix unit tests;
get rid of motherlode