Added "Skipped" and some minor changes

Will add the values of passed, failed and skipped later