all but one test passing.  fixed some cuke test stuff