Tests passing again, now need to check models
Cleaned up array functions + a few tests & made everything work again