Fix some nits and change test to assert