Adding unit tests for Cameron Bielstein (ctb677)