Simplifying some tests + reaching 100% test coverage.