added additional test coverage; started moving logic around for final pods rewrite