Fix/remove code coverage