Added new tests and test helpers