Made more tests