Improved asserts
Enable these tests @ CircleCI #1368