Made the test pass with some compromises!