Helpers added, there are some improvements in tests