test: cleanup tests hierarchy