Fixing some build issues in test