DEVOPS-117 : cleaned up and added a few more tests