consistent content types (2);
fix unit tests;