Fixed syntax errors; brought to compile, fixed tests