Fixing BehaviorSinkTests and cleaning up