Fixed some test cases that were broken or not running all the way through