Tests now working, not passing
Fixing some tests