additional test + fixes