Small additions and fixes to tests (thanks to @eltjpm, #314)