splitted tests for parsmap and helpers
merging changes done in server with local
fixing output