cleaned up LayoutSingleTable and added tests