Added additional test types to application.

Fixes #153