Added unit tests.. stuff is broken still