funct tests pass now