Cleaned up unit and integration tests - removed commented out code.

Signed-off-by: Gil Clark <gilclark1@gmail.com>