more updates more tests