Added test and method