#207 tests disabled for deployment (temporarily)