More changes
Junk
Updates
Finally got some tests to work