Add code coverage, update spec