Remove unused class, small tweaks to test to try and increase coverage