Adding relevant method, adding tests