Added GetById methods with tests