Update test cases and standardize layout