Committed unit tests and updated to typeof source