Audit Fixes

Removed Unnecessary Type Casts from Tests
Removed Unnecessary Exceptions
Fixed "One Statement Per Line" Audit