more multitests
clean up code