addiing more helpers and tests