Add more helpers to tests and fix failling spec