Less brittle tests for development env