Restructuring of tests

This allows the breaking out of layout and client tests