further name improvements in Tests, simplified imports