Extended code coverage in tests and better(?) abstract type handling.