Added tests, add hack to fix some test cases
Bumped version to 0.3.3