More tests + code coverage