Fixed test broken with changes, added 3 more test