Refactored module, fixed tests, fixed file identation configuration