Issue #60: added insert before test data. Made refactoring