Fixed most tests