Modified Tests to have more readability