Added more tester files and added more checks to the code