updated tests hierarchy
bugfixes