refactored names
automated test
refined tests