Added support for Nilaksh photo model
Test improvements