Refactored test into separate files. Added test cases for wrapping original if statement.
Small cleanups in lib
bumped version