Added even more tests