Improve and test "blabla should contain" steps. Rename features.