Tests were causing bugs, fixed