re-written tests, made simpler