Tests
New fixes