Add FunctionalTesting layer.
Cleanup a bit.