Finish layouts and tests