Specs updated to latest syntax
updated test files
updated test files