Updated unit tests. Two still failing. Pushing this then adding Keith's views