Moves OptGroup tests into correct folder
Minor render base class refactor