Maintenance on Feature tests. Consolidated shelter related specs.