Added more tests, updated for !=