Finished switching test to Layout.