Boy scout work: fix deprecation warnings
Boy scout work: resolve rspec3 ambiguous symbol warnings