Removed some magic strings
Handle Skipped Tests