Make test green
Fix minor issues