Added a quick test and fixed up some things