Implementing more tests