Refactored test names
Set category to SMoke for full end to end tests