Added some tests. Fixed the dang dadgumits