added more test coverage.
resolved issues related to passed parameters not being handled correctly.