fixed tests so that everything passes