rearranged tests a bit, modified test params
updated test runners