Improve acceptance test scenarios and fix found bug in editing words