refactor names to convention
refactor tests