re-arranged vs solution for testing