More initial batch unit tests