CS: removed redundant usings and tidied test.