fixed nonworking tests