Aded more tests