Rewrite initializer tests