Added some basic testing (working on this)