Hopefully fixed code coverage as well