Fix namespaces, adjust tests and App.