Refined tests. Refactored.