Fixed tests
Fixed remaining issue, all tests now pass