Removing QA usage

Instead focusing on isolating the behavior