Fixed some test names. Added tests for optional parameters.