'changes to ensure that nil paramaters arent passed in'
most rspec tests passing