Refactored ramlReposotory, and updated tests accordingly