Fixed and updated specs

Mix match of spec fixes including:

* fixing actual specs
* removed a bunch of empty parenthesis
* updated specs to use new rspec syntax