Issue 36 add integration tests