updated tests
merged from master, updated script and project.clj