Added the shark testing suite to the project
fixed merge conflicts