Better than nothing
More tests passing
More fixed tests
Fixed tests failing due to index
All tests passing