Reverted commented out unit tests (uncommented them)