Added syntax highlighting, tests