Refactor test data into test dir. Fix broken tests - all tests pass.