Clean up and test layering