develop
removed unnecessary usings
Modified the Asserts lines of a few tests to give better info on failure