#14 refactor tests