Initialize members in the correct order.
Remove unnecessary check.
Speed up test.