Add new tests from geisler