ADD: some more unit tests