Refactor Application mocks

Adds site mock
Remove garbage code