clean up, better tests