some broken tests, getting back to it