More unit tests, fixes a static search options that was mutable globally :(