tests rewriten a bit, multiple assignment tests pass