updated test suite

Using latest conventions and Assert 2.0.