Handler tests all passing