ticket:13 tests updated