Change USERNAME field to USER as per SiteMinder standard
Separate out unit tests from integration tests