AND results in tests need to be changed, seems to be working