I actually made the tests pass this time hahaha