Adhering to Coder Module, adding Tests