Added test and helper