Refactoring test env

Author:    GianArb <gianarb92@gmail.com>