[#68359306] Created tests and modularized code for more testing