Simplified tests into a single paramaterised test file.