removed pattern matching, tests work