Move individual expectations into a single test