fix up tests / type coerceion
fix up tests / type coerceion
change test structure