Add unit tests for SUREFIRE-963