Renamed previous test and added a test helper for common operations
Added new tests to haver better test coverage and fixed small issue
1.0.0