Feature/refactor

Close issue https://github.com/MageTest/MageSpec/issues/24