Minor fixes to make tests work