Added more tests and goimports.