More testing related changes