Added integration tests
Added approve page
merged with master