Add further tests, flesh out assertion logic