Reorganised test to better follow pattern