ticket:1 fixing tests