fixed modifier bugs and tests. 0.1-SNAPSHOT