modifies spec
fixes tests
Merge branch 'master' of https://github.com/derekchen14/notableBeta