Some specs/tests cleanup.