Added missing file and fixed a unit test