Added 40 tests, no changes needed