Refactor operations parsing. Add one more test