fixing requires and tests