Refactor Logic Spec's
Fix naming
Merge pull request #6 from cakper/refactor-logic-expression

Refactor Logic Spec's