Tweeked unit tests

renamed some dodgy methods and placed input tests in correct namespace