Cleaned testing

@hooverlunch This is what I was talking about, it is nice as it also does merge tests with the branch. Just :+1: if you agree with my changes.