Updated tests, still have 3 failing
Tests all passing
Tests all passing