Fixed Tests, tweaked style