Fixed deprecation error
Added tests, all passing
Fixed failing test