fix tests and update assertion format