Fix compiler warnings; use EXPECT over ASSERT