ticket:5 fixed ProgrammingError
ticket:5 updated tests according to ProgrammingError fix