Fix syntax. Additional tests.