Adding in basic unit testing and fixing code issues since moving