#182 rework add feature tests
#182 rework edit feature tests
#182 minor improvement: rename method
#182 minor improvement: rearrange methods
#182 fix test to run as expected