fixing tests
removed spurious uses of 'or'
added prep-tasks