Improved the test Helper