first round of working tests
fix up