added more constraints, removed textual/array generations from test
class