Fixed compile errors in unit & integration tests