Improved tests assertions (moved where possible from ASSERT_* to EXPECT_*)