Completed methos impl. and now fixing tests