[RUN MULTIPLE TESTS] Improvements on functionality #413