Better tests
Quick fixes