Added test
Added changes to layout. Still working!