Tests added, code refactored