replaced and removed usings in Tests and UI