Make test suite a bit more general