more test and naming fixes