Renamed "Non*" => "Not*"
Fixed Deps, added tests