Add a few specs
Change initializer to to_prepare