Renamed some vars
Implemented nose tests