fix test_expressiondata stuff, move test_subset to test_basedata and parameterized
whitespace and remove random "pass" statement