fix unit tests;
move test/content