added test classes according to new protocol structure