Added matrix testing -Kabir