Fixed and cleaned up failing test
Fixed deprecated statement