restored test methods inadvertently removed