Adding code coverage and some other crap