Modified the PHPUnit test and improved exception throwing
Merge remote-tracking branch 'origin/develop' into develop