improved tests a bit