manual merge of #410 with some test renaming