changed structure for classes and fixed issues which prevented starting unit tests