fixed tests; added missing files