Adds rhyno test and other stuff.  Complete for now