Clean test suite and improve reliability