Making first tests pass and elminating auto-generated tests