merging suggestions to make more tests tomorrow