Updated tests with coverage now 69%