4151 Capitalization fix and tests