Add App class.
Update tests.