bobified some more code
fixed and simplified default testing layer definition