added data for tests
bug fixes