deleted test feature
changed a few givens whens and thens