Fixes tests, gets coverage to 100% again