Add in basic tests, get tests working

Sort of there, but not there.