Adding some more testing and creating objects