fixed tests / removed unnecessary structure validation