SW-98. Fix paths and imports for unit tests. All pass now.