Add more tests, comment out not needed code.
Changing space-unary-ops options WORK IN PROGRESS