Add a more complex test

Also reduce the complexity of the testing matrix