New test passes
Fixed some broken tests