33/63 tests passing up to remove method