naming and test improvements