adding a test, fixing others