More work on the contrib tests