change few issues and add tests
Merge pull request #26 from mikhkonkov/multicode_asserts

change few issues and add tests