added a bunch of tests
resolved merge