fixed header tests
improved testing on layer controls
merged