Adding testing and starting to flesh out the testing structure