Removed old namespaces and files, created some new presentation unit tests