Finished consolidating controls module with test module