Updated asserts to the new structure of the problem data, fixed an issue...

... where a return statement was indented incorrectly