updated tests so they pass