Minor fix in test
Test updated to handle workDisplay
Codeformatting
Removed a few unused lines
Removed a few unused files