Question collection updated with list of statements
Type checker & tests updated with list of statements
Refactoring for more readable forms