port failing test from @joneslee85 model fork