Updated tests and further cleanup of old manual parameter APIs