Get some of the more unusual layouts working and added tests for them