Added Unit Testing bits
Fixed merge issues
Fixed merge issues
Removed commented code
Removed temp vars