Test passing - partialy refactored