fix tests
some naming fixes/perf, I hope
ambiguous name test