A bit more of a testing thing

Added some actual functional tests. Still a ways to go but better.