added lots of tests back