Added several tests and improved coverage definition.