Added implementation and tests boilerplate