Merge pull request #243 from rackspace-cookbooks/pfire

fixing testing (to pass, still need to seperate aio and normal tests)