Fixed cannot issue
Fixed ordering so tests pass