20140222 - Add #if defines to support testing of various configurations