moving some tests around to complete separation of unit and functional tests, subsecond 'rake unit' time