Layered test almost working.