Fixing pedantic tests.