Improve nose tests