Refractored test cases and layout file