Refactoring tests into module directories. Promises to Obserable for rxJava
Refactor and fix some tests