New 2 refactor tests