Revert "V0.07 Layout Test"

This reverts commit 88098f8a5980cb4a97e6e47315f283488ce3957c.