supporting challenge and accept, added tests