nose & mock
minor cleanup