additional test, some other minor changes