Foundation for sliding panel's tests
Cleanup unused variables/code
Architecture cleanup