moved to less lenient grammar syntax, switched test tabs to spaces