Add support for nose tests
Made unit tests cope with the initial migration