Fine tuned tests to be more specific