removed boolean shorthand
added tests
Merge branch 'master' into dev