Seperated test code, commented where needed