Fixing some tests
Trying to get tests passing