status commit, test fixes