Test update

Not too sure about the functionality of this modification. I am yet to find a bug.