new structure for tests
added drag functionality