added 45 tests