added and+or -- more tests
version bump