Fix missing comma for parameters and fixes to pass rspec tests