Separate case to two separate cases. Add a few more assertions