fixes
initial attempt at new tests
fix test