Fixing tests on boolean and complex expressions