Added some additional tests and layout improvements