ricardo_murad: more tests and some refactoring