Make tests less noisy
Add better error handling