Add test coverage to Bjørn's work.