updated batch and spec helper as well as renamed specs