Added unit tests back. Tweaked a few to get them to run again