Unit tests refactored
Bumping up version number