BoundedExpression fixes and first bunch of tests.