Improves ;; handling, adds more tests