bug fixes for dynamic tests