saving progress, finish fixing existing tests, add a few more