We describe extensions and tests of the code "multimode" which does vibrational self-consistent field method (VSCF) and two types of state-mixing (denoted VSCF-CI and V-CI) for rovibrational energies of many-mode systems. The extensions include an exact treatment of rotation, flexible approaches to perform the CI calculations, and the inclusion of a Davidson diagonalization routine to find low-lying eigenvalues of large matrices. The code is tested against previous exact variational calculations for non-rotating H2CN, and J = 0 and J = 1 rovibrational states of H2CS. The code represents the full potential by a hierarchical n-mode representation, where n is the number of normal coordinates that are coupled together. Tests are presented for the convergence and accuracy of this representation for n equal to 3 and 4, where 4 is the current maximum value. These tests are done at the VSCF and V-CI level, with very encouraging results.