Fixed failing tests and re-added support for +, - and check labels.