Refactor and fixing tests...