Tests Running for longer, and tidied up slightly