Add return tests
Handle EmptyStatement in cpsAtomic
Handle return statements correctly