Fix tests to cover 100%