Fixed up broken tests. Added a few new ones. 2-3 still failing.