Improve test coverage, clean operations