Fixed more tests
All prior tests now working