Added first two cal integration tests