corrected/added a couple of tests