Added Andrew as collaborator and added Unit Tests.