discovered reset\!, replacing swap\!.
clean up- and fix tests. add more handler-tests