Better internal assertions, no errors thrown
Fixed tests