1. Added powermokito dependency(for mocking finam methods)
2. Implemented more tests
3. Improved code