added tests for interceptor and removed unneeded argument parser
refactored to include better naming and tests