golint and test reorganization