new tests in place, not passing yet