fixing nosetest order and merging branch