cleaned up ExpressionScan and added tests
Merge pull request #39 from timbokopter/feature/cleanup_ExpressionScan

cleaned up ExpressionScan and added tests