Added autotest
autotest
Added layouts