Updated Test Code as requested by mike