a bit more cleanup and handle/effect tests