added mockito, updated to latest storm version, fixed tests