Added test method to clean up code