Extended Arquillian tests for Cook, fixed some bugs