ticket:15 refactor test and signals