Some more testing added