Fixed some odd bracket placements, tests were getting nested when
they shouldn't.