Fixed Test and prolly a bunch of other stuff