Added even more tests and increased coverage.