moving test layouts to layouts folder and updating tests