Increase test coverage

Some more specs and code removal to increase test coverage.