Added new tests, as well as making it possible to only have a single condition